Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 7 Jan 2012 19:51:13 +0000 (11:51 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 7 Jan 2012 19:51:13 +0000 (11:51 -0800)
commitc6f3b2cccde6ea5e5a97c7e34f7507e0fff21161
tree24bb9caab34cd7c78386a6511d716c79e4bdf170
parentb660e9d797bffbb7f896a55b883ba873573f9c88
parent0a5a83e9e93fe5304e646ba770406cd8e2e7bff0
Merge from trunk.
lisp/ChangeLog
lisp/epg.el
lisp/files.el
src/ChangeLog
src/fileio.c